Skip to content

Rollup of 14 pull requests#158581

Closed
JonathanBrouwer wants to merge 52 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-96RiQZV
Closed

Rollup of 14 pull requests#158581
JonathanBrouwer wants to merge 52 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-96RiQZV

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

Rohan-Singla and others added 30 commits June 18, 2026 15:23
…pported (windows, unix, uefi, etc.); modified the Unix implementation to use fchmodat instead of open + fchmod; clarified documentations for set_permissions_nofollow; added a test case for set_permissions_nofollow
Co-authored-by: Daniil Kovalev <dkovalev@accesssoftek.com>
Allow PAC metadata to be passed to `get_fn_addr` and related API
changes.
The set of supported attributes is:
function
* "aarch64-jump-table-hardening"
* "ptrauth-auth-traps"
* "ptrauth-calls"
* "ptrauth-indirect-gotos"
* "ptrauth-returns"
module
* "ptrauth-elf-got"
* "ptrauth-sign-personality"
Also:
* update tests to force dynamic library when targetting pauthtest
* various test fixes
* introduce end-to-end tests for pauthtest (in run-make)
Currently, rustc can emit a FatalError diagnostic during parsing of
literals and tokenstreams. These are handled under the hood as a panic,
which means that proc-macro code needed to catch_unwind if it wanted to
fallibly parse some code. These still emit diagnostics, so in practice
this isn't a full fix, but it at least makes the interface on the macro
side a bit more uniform.

This is primarily motivated by wasm proc macros which can't use
catch_unwind and so this lets the test's output be the same with and
without them.
Add a run-make test that checks the `.o` members in the prebuilt
`libcompiler_builtins` archive for `wasm32-wasip1` are wasm objects.

This guards against building wasm compiler-rt fallbacks with the host C
toolchain.
* refactor: move attribute and keywords docs files to core
* fix references to `std`
* tidy fixes
* ignore doc tests w/ explicit_tail_calls
* revert `unsafe` example and ignore specifically WASM for `become` doc tests
* add explicit note about doube including the docs in `core` and `std`
* missed refactoring of doc test ignore
* conditionally exclude doc-test containing threading for `wasm-wasip1`
* Change exclusion to just `wasi` target_os

Co-authored-by: Justin Schilleman <97192655+jschillem@users.noreply.github.com>
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-core-stubs` A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jun 29, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,x86_64-gnu-aux,x86_64-gnu-llvm-21-3,x86_64-msvc-1,aarch64-apple,x86_64-mingw-1,i686-msvc-2

@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0f18792 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 29, 2026
@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

⌛ Trying commit 0f18792 with merge 4ccb54e

To cancel the try build, run the command @bors try cancel.

Workflow: https://github.com/rust-lang/rust/actions/runs/28396861382

rust-bors Bot pushed a commit that referenced this pull request Jun 29, 2026
Rollup of 14 pull requests


try-job: dist-various-1
try-job: test-various
try-job: x86_64-gnu-aux
try-job: x86_64-gnu-llvm-21-3
try-job: x86_64-msvc-1
try-job: aarch64-apple
try-job: x86_64-mingw-1
try-job: i686-msvc-2
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

The job test-various failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test [run-make] tests/run-make/parallel-rustc-no-overwrite ... ok
test [run-make] tests/run-make/pass-linker-flags-flavor ... ignored, only executed when the operating system is linux
test [run-make] tests/run-make/pass-linker-flags ... ok
test [run-make] tests/run-make/pass-non-c-like-enum-to-c ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pauth-quicksort-c-driver ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pauth-quicksort-rust-driver ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pauth-static-link-warning ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pdb-alt-path ... ignored, only executed when the target is x86_64-pc-windows-msvc
test [run-make] tests/run-make/pdb-sobjname ... ignored, only executed when the operating system and target environment are windows-msvc
test [run-make] tests/run-make/pgo-branch-weights ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pgo-embed-bc-lto ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pgo-gen ... ignored, ignored when cross-compiling
---
test [ui] tests/ui/static/static_sized_requirement.rs ... ok
test [ui] tests/ui/static/static-struct-initialization-5688.rs ... ok
test [ui] tests/ui/statics/check-values-constraints.rs ... ok
test [ui] tests/ui/statics/conditional-static-declaration-16010.rs ... ok
test [ui] tests/ui/statics/crt-static-pauthtest.rs ... ignored, only executed when the ABI is pauthtest
test [ui] tests/ui/statics/check-recursion-foreign.rs ... ok
test [ui] tests/ui/statics/const_generics.rs#noopt ... ok
test [ui] tests/ui/statics/const_generics.rs#opt ... ok
test [ui] tests/ui/statics/issue-14227.rs ... ok
test [ui] tests/ui/statics/enum-with-static-str-variant-13214.rs ... ok
---
test [codegen] tests/codegen-llvm/panic-in-drop-abort.rs ... ok
test [codegen] tests/codegen-llvm/packedstack.rs ... ok
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-both-flags.rs ... ok
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-one-flag.rs ... ok
test [codegen] tests/codegen-llvm/pauth/pauth-attr-special-funcs.rs ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c-direct-indirect-call.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c-direct-indirect-call.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O0_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O0_PAUTH-ELF-GOT ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O3_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O3_PAUTH-ELF-GOT ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O0_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O3_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-init-fini.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-init-fini.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pclmulqdq-target-feature-inlining.rs ... ignored, only executed when the architecture is x86_64
test [codegen] tests/codegen-llvm/personality_lifetimes.rs ... ignored, ignored on targets without unwinding support
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-section.rs ... ok
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-no-flag.rs ... ok
test [codegen] tests/codegen-llvm/pattern_type_symbols.rs ... ok
---
test [assembly] tests/assembly-llvm/nvptx-linking-cdylib.rs ... ignored, only executed when the architecture is nvptx64
test [assembly] tests/assembly-llvm/nvptx-safe-naming.rs ... ignored, only executed when the architecture is nvptx64
test [assembly] tests/assembly-llvm/panic-no-unwind-no-uwtable.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
test [assembly] tests/assembly-llvm/panic-unwind-no-uwtable.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
test [assembly] tests/assembly-llvm/pauth-basic.rs#aarch64_unknown_linux_pauthtest ... ignored, only executed when the ABI is pauthtest
test [assembly] tests/assembly-llvm/naked-functions/wasm32.rs#wasm32-wasip1 ... ok
test [assembly] tests/assembly-llvm/naked-functions/wasm32.rs#wasm64-unknown ... ok
test [assembly] tests/assembly-llvm/naked-functions/wasm32.rs#wasm32-unknown ... ok
test [assembly] tests/assembly-llvm/pic-relocation-model.rs#x64 ... ok
test [assembly] tests/assembly-llvm/pie-relocation-model.rs#x64 ... ok
---
test [run-make] tests/run-make/pass-linker-flags ... ignored, ignored if target does not support std
test [run-make] tests/run-make/pass-linker-flags-flavor ... ignored, only executed when the operating system is linux
test [run-make] tests/run-make/pass-linker-flags-from-dep ... ignored, ignored if target does not support std
test [run-make] tests/run-make/pass-non-c-like-enum-to-c ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pauth-quicksort-c-driver ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pauth-quicksort-rust-driver ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pauth-static-link-warning ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pdb-alt-path ... ignored, only executed when the target is x86_64-pc-windows-msvc
test [run-make] tests/run-make/pdb-sobjname ... ignored, only executed when the operating system and target environment are windows-msvc
test [run-make] tests/run-make/pgo-branch-weights ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pgo-embed-bc-lto ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pgo-gen ... ignored, ignored when cross-compiling
---
test [assembly] tests/assembly-llvm/nvptx-linking-cdylib.rs ... ignored, ignored when the architecture is nvptx64
test [assembly] tests/assembly-llvm/nvptx-kernel-abi/nvptx-kernel-args-abi-v7.rs ... ok
test [assembly] tests/assembly-llvm/panic-no-unwind-no-uwtable.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
test [assembly] tests/assembly-llvm/panic-unwind-no-uwtable.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
test [assembly] tests/assembly-llvm/pauth-basic.rs#aarch64_unknown_linux_pauthtest ... ignored, only executed when the ABI is pauthtest
test [assembly] tests/assembly-llvm/nvptx-debug.rs ... ok
test [assembly] tests/assembly-llvm/nvptx-safe-naming.rs ... ok
test [assembly] tests/assembly-llvm/nvptx-internalizing.rs ... ok
test [assembly] tests/assembly-llvm/pic-relocation-model.rs#x64 ... ok
test [assembly] tests/assembly-llvm/pie-relocation-model.rs#x64 ... ok
---
test [ui] tests/ui/statics/check-immutable-mut-slices.rs ... ok
test [ui] tests/ui/static/static-struct-initialization-5688.rs ... ok
test [ui] tests/ui/statics/check-values-constraints.rs ... ok
test [ui] tests/ui/statics/check-recursion-foreign.rs ... ok
test [ui] tests/ui/statics/crt-static-pauthtest.rs ... ignored, only executed when the ABI is pauthtest
test [ui] tests/ui/statics/conditional-static-declaration-16010.rs ... ok
test [ui] tests/ui/statics/const_generics.rs#noopt ... ok
test [ui] tests/ui/statics/const_generics.rs#opt ... ok
test [ui] tests/ui/statics/issue-14227.rs ... ok
test [ui] tests/ui/statics/enum-with-static-str-variant-13214.rs ... ok
---
test [codegen] tests/codegen-llvm/panic-unwind-default-uwtable.rs ... ok
test [codegen] tests/codegen-llvm/packedstack.rs ... ok
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-both-flags.rs ... ok
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-no-flag.rs ... ok
test [codegen] tests/codegen-llvm/pauth/pauth-attr-special-funcs.rs ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c-direct-indirect-call.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c-direct-indirect-call.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O0_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O0_PAUTH-ELF-GOT ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O3_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-c.rs#O3_PAUTH-ELF-GOT ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O0_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O3_NO_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-extern-weak-global.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-init-fini.rs#O0_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/pauth/pauth-init-fini.rs#O3_PAUTH ... ignored, only executed when the ABI is pauthtest
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-section.rs ... ok
test [codegen] tests/codegen-llvm/patchable-function-entry/patchable-function-entry-one-flag.rs ... ok
test [codegen] tests/codegen-llvm/pattern_type_symbols.rs ... ok
test [codegen] tests/codegen-llvm/pclmulqdq-target-feature-inlining.rs ... ok
test [codegen] tests/codegen-llvm/personality_lifetimes.rs ... ok
test [codegen] tests/codegen-llvm/pie-relocation-model.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
---
test [assembly] tests/assembly-llvm/nvptx-linking-cdylib.rs ... ignored, only executed when the architecture is nvptx64
test [assembly] tests/assembly-llvm/nvptx-safe-naming.rs ... ignored, only executed when the architecture is nvptx64
test [assembly] tests/assembly-llvm/panic-no-unwind-no-uwtable.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
test [assembly] tests/assembly-llvm/panic-unwind-no-uwtable.rs ... ignored, only executed when the target is x86_64-unknown-linux-gnu
test [assembly] tests/assembly-llvm/pauth-basic.rs#aarch64_unknown_linux_pauthtest ... ignored, only executed when the ABI is pauthtest
test [assembly] tests/assembly-llvm/naked-functions/link-section-windows.rs#x86-uefi ... ok
test [assembly] tests/assembly-llvm/naked-functions/x86_64-naked-fn-no-cet-prolog.rs ... ok
test [assembly] tests/assembly-llvm/naked-functions/wasm32.rs#wasm64-unknown ... ok
test [assembly] tests/assembly-llvm/pic-relocation-model.rs#x64 ... ok
test [assembly] tests/assembly-llvm/pie-relocation-model.rs#x64 ... ok
---
test [run-make] tests/run-make/parallel-rustc-no-overwrite ... ok
test [run-make] tests/run-make/pass-linker-flags ... ok
test [run-make] tests/run-make/pass-linker-flags-flavor ... ok
test [run-make] tests/run-make/pass-non-c-like-enum-to-c ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pauth-quicksort-c-driver ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pauth-quicksort-rust-driver ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pauth-static-link-warning ... ignored, only executed when the ABI is pauthtest
test [run-make] tests/run-make/pdb-alt-path ... ignored, only executed when the target is x86_64-pc-windows-msvc
test [run-make] tests/run-make/pdb-sobjname ... ignored, only executed when the operating system and target environment are windows-msvc
test [run-make] tests/run-make/pgo-branch-weights ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pgo-embed-bc-lto ... ignored, ignored when cross-compiling
test [run-make] tests/run-make/pgo-gen ... ignored, ignored when cross-compiling
---

error[E0308]: mismatched types
   --> library/std/src/sys/fs/uefi.rs:482:53
    |
482 | pub fn set_perm(p: &Path, perm: FilePermissions) -> io::Result<()> {
    |        --------                                     ^^^^^^^^^^^^^^ expected `Result<(), Error>`, found `()`
    |        |
    |        implicitly returns `()` as its body has no tail or `return` expression
483 |     // UEFI does not support symlinks
484 |     set_perm_nofollow(p, perm);
    |                               - help: remove this semicolon to return this value
    |
    = note:   expected enum `core::result::Result<(), core::io::Error>`
            found unit type `()`

For more information about this error, try `rustc --explain E0308`.

@rust-bors rust-bors Bot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 29, 2026
@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

PR #158168, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 29, 2026
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jun 29, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors try cancel

@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Try build cancelled. Cancelled workflows:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) A-CI Area: Our Github Actions CI A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-rustdoc-json Area: Rustdoc JSON backend A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-core-stubs` A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.